merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Tue, 25 Mar 2008 18:37:17 +0000 (12:37 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 25 Mar 2008 18:37:17 +0000 (12:37 -0600)
1  2 
.hgignore

diff --cc .hgignore
Simple merge